Skip to content

Keep file id on move - #4524

Merged
rullzer merged 16 commits into
masterfrom
downstream-27508
Apr 28, 2017
Merged

Keep file id on move#4524
rullzer merged 16 commits into
masterfrom
downstream-27508

Conversation

@nickvergessen

Copy link
Copy Markdown
Member

Downstream 27508

@nickvergessen nickvergessen added 3. to review Waiting for reviews downstream labels Apr 26, 2017
@nickvergessen nickvergessen added this to the Nextcloud 12.0 milestone Apr 26, 2017
@mention-bot

Copy link
Copy Markdown

@nickvergessen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @icewind1991, @SergioBertolinSG and @rullzer to be potential reviewers.

@icewind1991 icewind1991 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks ok

@rullzer

rullzer commented Apr 26, 2017

Copy link
Copy Markdown
Member

CI is not happy 😞

@codecov

codecov Bot commented Apr 27, 2017

Copy link
Copy Markdown

Codecov Report

Merging #4524 into master will decrease coverage by 22.87%.
The diff coverage is 22.36%.

@@              Coverage Diff              @@
##             master    #4524       +/-   ##
=============================================
- Coverage     54.26%   31.39%   -22.88%     
- Complexity    21897    21898        +1     
=============================================
  Files          1348     1348               
  Lines         83971    83383      -588     
  Branches       1334     1334               
=============================================
- Hits          45564    26175    -19389     
- Misses        38407    57208    +18801
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/View.php 0.85% <ø> (-85.07%) 362 <0> (ø)
apps/dav/lib/Connector/Sabre/ObjectTree.php 0% <ø> (-54.29%) 33 <0> (-27)
apps/dav/lib/Connector/Sabre/Directory.php 1.91% <0%> (-59.41%) 65 <21> (+24)
apps/dav/lib/Connector/Sabre/File.php 0% <0%> (-71.43%) 97 <0> (+1)
apps/dav/lib/Connector/Sabre/FilesPlugin.php 70.94% <100%> (-8.68%) 51 <3> (+4)
lib/private/Repair/NC11/FixMountStorages.php 0% <0%> (-100%) 5% <0%> (ø)
lib/private/DB/SQLiteSessionInit.php 0% <0%> (-100%) 4% <0%> (ø)
...ib/private/Files/Config/UserMountCacheListener.php 0% <0%> (-100%) 2% <0%> (ø)
lib/private/SystemTag/ManagerFactory.php 0% <0%> (-100%) 3% <0%> (ø)
apps/files_sharing/lib/SharedPropagator.php 0% <0%> (-100%) 1% <0%> (ø)
... and 358 more

@MorrisJobke

Copy link
Copy Markdown
Member

CI is not happy 😞

Fixed by renaming the copied class 🙈

@MorrisJobke MorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍 Also fixes #4284

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 27, 2017
@MorrisJobke

Copy link
Copy Markdown
Member
PHP Fatal error:  Call to a member function setName() on boolean in /drone/src/github.com/nextcloud/server/3rdparty/sabre/dav/lib/DAV/Tree.php on line 151

@rullzer @icewind1991 @nickvergessen Can one of you look into this?

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Apr 27, 2017
nickvergessen and others added 4 commits April 27, 2017 09:15
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke

Copy link
Copy Markdown
Member

@nickvergessen Unit Tests are still failing

Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Apr 27, 2017
@rullzer
rullzer merged commit 9da697b into master Apr 28, 2017
@rullzer
rullzer deleted the downstream-27508 branch April 28, 2017 07:37
@MorrisJobke

Copy link
Copy Markdown
Member

@nickvergessen Backport?

@nickvergessen

Copy link
Copy Markdown
Member Author

Don't really feel like backporting a 800 lines patch like this to 11....
But if all agree I can do it.

if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
if (!$node->getFileInfo()->isReadable()) {
// avoid detecting files through this means
throw new NotFound();

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regression, this breaks dir listing for folders which have an item blocked by files access control:
nextcloud/files_accesscontrol#65

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants